sys: regenerate with new gir
authorFelix Krull <f_krull@gmx.de>
Mon, 20 May 2019 21:09:38 +0000 (23:09 +0200)
committerColin Walters <walters@verbum.org>
Fri, 6 May 2022 16:53:53 +0000 (12:53 -0400)
rust-bindings/rust/sys/Cargo.toml
rust-bindings/rust/sys/build.rs
rust-bindings/rust/sys/src/auto/versions.txt
rust-bindings/rust/sys/src/lib.rs
rust-bindings/rust/sys/tests/abi.rs
rust-bindings/rust/sys/tests/constant.c

index 235622a01ca9b06439254cc44a6ce3d9259bc67c..c48100dd52cbc49177b2f215e38ab184473bd60d 100644 (file)
@@ -5,9 +5,9 @@ repository = "fkrull/ostree-rs"
 pkg-config = "0.3.7"
 
 [dependencies]
-gio-sys = "0.7"
-glib-sys = "0.7"
-gobject-sys = "0.7"
+gio-sys = "0.8.0"
+glib-sys = "0.8.0"
+gobject-sys = "0.8.0"
 libc = "0.2"
 
 [dev-dependencies]
@@ -15,21 +15,15 @@ shell-words = "0.1.0"
 tempdir = "0.3"
 
 [features]
-dox = []
 v2014_9 = []
 v2015_7 = ["v2014_9"]
-v2016_14 = ["v2016_8"]
 v2016_4 = ["v2015_7"]
 v2016_5 = ["v2016_4"]
 v2016_6 = ["v2016_5"]
 v2016_7 = ["v2016_6"]
 v2016_8 = ["v2016_7"]
+v2016_14 = ["v2016_8"]
 v2017_1 = ["v2016_14"]
-v2017_10 = ["v2017_9"]
-v2017_11 = ["v2017_10"]
-v2017_12 = ["v2017_11"]
-v2017_13 = ["v2017_12"]
-v2017_15 = ["v2017_13"]
 v2017_2 = ["v2017_1"]
 v2017_3 = ["v2017_2"]
 v2017_4 = ["v2017_3"]
@@ -37,6 +31,11 @@ v2017_6 = ["v2017_4"]
 v2017_7 = ["v2017_6"]
 v2017_8 = ["v2017_7"]
 v2017_9 = ["v2017_8"]
+v2017_10 = ["v2017_9"]
+v2017_11 = ["v2017_10"]
+v2017_12 = ["v2017_11"]
+v2017_13 = ["v2017_12"]
+v2017_15 = ["v2017_13"]
 v2018_2 = ["v2017_15"]
 v2018_3 = ["v2018_2"]
 v2018_5 = ["v2018_3"]
@@ -44,6 +43,7 @@ v2018_6 = ["v2018_5"]
 v2018_7 = ["v2018_6"]
 v2018_9 = ["v2018_7"]
 v2019_2 = ["v2018_9"]
+dox = []
 
 [lib]
 name = "ostree_sys"
index 700f87bd25d2202e1ab750b1318654bae932538b..f71c57441f21cd33bae2c6359917ef05b368a723 100644 (file)
@@ -1,3 +1,7 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
 extern crate pkg_config;
 
 use pkg_config::{Config, Error};
@@ -74,6 +78,9 @@ fn find() -> Result<(), Error> {
         "0.0"
     };
 
+    if let Ok(inc_dir) = env::var("GTK_INCLUDE_DIR") {
+        println!("cargo:include={}", inc_dir);
+    }
     if let Ok(lib_dir) = env::var("GTK_LIB_DIR") {
         for lib_ in shared_libs.iter() {
             println!("cargo:rustc-link-lib=dylib={}", lib_);
@@ -93,6 +100,9 @@ fn find() -> Result<(), Error> {
     }
     match config.probe(package_name) {
         Ok(library) => {
+            if let Ok(paths) = std::env::join_paths(library.include_paths) {
+                println!("cargo:include={}", paths.to_string_lossy());
+            }
             if hardcode_shared_libs {
                 for lib_ in shared_libs.iter() {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
index 1e3acbd1f6f9ca943f2fb00f13b1380ada0e64a1..be52760aa761910c2cdaa573bac8b4f9fa444443 100644 (file)
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ ffda6f9)
+Generated by gir (https://github.com/gtk-rs/gir @ fec179c)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
index 3b90b55579235f17305b236dad1f45594f0bceb5..8eb4691291e2676a24e023b03c15fe42a6326c03 100644 (file)
@@ -3,7 +3,7 @@
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
-#![cfg_attr(feature = "cargo-clippy", allow(approx_constant, type_complexity, unreadable_literal))]
+#![allow(clippy::approx_constant, clippy::type_complexity, clippy::unreadable_literal)]
 
 extern crate libc;
 extern crate glib_sys as glib;
@@ -52,9 +52,8 @@ pub const OSTREE_GPG_SIGNATURE_ATTR_USER_NAME: OstreeGpgSignatureAttr = 10;
 pub const OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL: OstreeGpgSignatureAttr = 11;
 pub const OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY: OstreeGpgSignatureAttr = 12;
 
-pub type GpgSignatureFormatFlags = c_int;
-pub const OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT: GpgSignatureFormatFlags = 0;
-pub type OstreeGpgSignatureFormatFlags = GpgSignatureFormatFlags;
+pub type OstreeGpgSignatureFormatFlags = c_int;
+pub const OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT: OstreeGpgSignatureFormatFlags = 0;
 
 pub type OstreeObjectType = c_int;
 pub const OSTREE_OBJECT_TYPE_FILE: OstreeObjectType = 1;
@@ -227,54 +226,29 @@ impl ::std::fmt::Debug for OstreeAsyncProgressClass {
 }
 
 #[repr(C)]
-pub struct OstreeBootloader(c_void);
+pub struct _OstreeBootloader(c_void);
 
-impl ::std::fmt::Debug for OstreeBootloader {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootloader @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeBootloader = *mut _OstreeBootloader;
 
 #[repr(C)]
-pub struct OstreeBootloaderGrub2(c_void);
+pub struct _OstreeBootloaderGrub2(c_void);
 
-impl ::std::fmt::Debug for OstreeBootloaderGrub2 {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootloaderGrub2 @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeBootloaderGrub2 = *mut _OstreeBootloaderGrub2;
 
 #[repr(C)]
-pub struct OstreeBootloaderSyslinux(c_void);
+pub struct _OstreeBootloaderSyslinux(c_void);
 
-impl ::std::fmt::Debug for OstreeBootloaderSyslinux {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootloaderSyslinux @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeBootloaderSyslinux = *mut _OstreeBootloaderSyslinux;
 
 #[repr(C)]
-pub struct OstreeBootloaderUboot(c_void);
+pub struct _OstreeBootloaderUboot(c_void);
 
-impl ::std::fmt::Debug for OstreeBootloaderUboot {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootloaderUboot @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeBootloaderUboot = *mut _OstreeBootloaderUboot;
 
 #[repr(C)]
-pub struct OstreeChecksumInputStreamPrivate(c_void);
+pub struct _OstreeChecksumInputStreamPrivate(c_void);
 
-impl ::std::fmt::Debug for OstreeChecksumInputStreamPrivate {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeChecksumInputStreamPrivate @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeChecksumInputStreamPrivate = *mut _OstreeChecksumInputStreamPrivate;
 
 #[repr(C)]
 #[derive(Copy, Clone)]
@@ -342,44 +316,24 @@ impl ::std::fmt::Debug for OstreeDiffItem {
 }
 
 #[repr(C)]
-pub struct OstreeGpgVerifier(c_void);
+pub struct _OstreeGpgVerifier(c_void);
 
-impl ::std::fmt::Debug for OstreeGpgVerifier {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeGpgVerifier @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeGpgVerifier = *mut _OstreeGpgVerifier;
 
 #[repr(C)]
-pub struct OstreeLibarchiveInputStreamPrivate(c_void);
+pub struct _OstreeLibarchiveInputStreamPrivate(c_void);
 
-impl ::std::fmt::Debug for OstreeLibarchiveInputStreamPrivate {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLibarchiveInputStreamPrivate @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeLibarchiveInputStreamPrivate = *mut _OstreeLibarchiveInputStreamPrivate;
 
 #[repr(C)]
-pub struct OstreeLzmaCompressor(c_void);
+pub struct _OstreeLzmaCompressor(c_void);
 
-impl ::std::fmt::Debug for OstreeLzmaCompressor {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLzmaCompressor @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeLzmaCompressor = *mut _OstreeLzmaCompressor;
 
 #[repr(C)]
-pub struct OstreeLzmaDecompressor(c_void);
+pub struct _OstreeLzmaDecompressor(c_void);
 
-impl ::std::fmt::Debug for OstreeLzmaDecompressor {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLzmaDecompressor @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeLzmaDecompressor = *mut _OstreeLzmaDecompressor;
 
 #[repr(C)]
 #[derive(Copy, Clone)]
@@ -473,8 +427,9 @@ impl ::std::fmt::Debug for OstreeRepoCheckoutAtOptions {
 pub struct OstreeRepoCheckoutOptions {
     pub mode: OstreeRepoCheckoutMode,
     pub overwrite_mode: OstreeRepoCheckoutOverwriteMode,
+    pub enable_uncompressed_cache: c_uint,
     _truncated_record_marker: c_void,
-    // /*Ignored*/field enable_uncompressed_cache has incomplete type
+    // field disable_fsync has incomplete type
 }
 
 impl ::std::fmt::Debug for OstreeRepoCheckoutOptions {
@@ -482,6 +437,7 @@ impl ::std::fmt::Debug for OstreeRepoCheckoutOptions {
         f.debug_struct(&format!("OstreeRepoCheckoutOptions @ {:?}", self as *const _))
          .field("mode", &self.mode)
          .field("overwrite_mode", &self.overwrite_mode)
+         .field("enable_uncompressed_cache", &self.enable_uncompressed_cache)
          .finish()
     }
 }
@@ -525,13 +481,15 @@ impl ::std::fmt::Debug for OstreeRepoDevInoCache {
 
 #[repr(C)]
 pub struct OstreeRepoExportArchiveOptions {
+    pub disable_xattrs: c_uint,
     _truncated_record_marker: c_void,
-    // /*Ignored*/field disable_xattrs has incomplete type
+    // field reserved has incomplete type
 }
 
 impl ::std::fmt::Debug for OstreeRepoExportArchiveOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
         f.debug_struct(&format!("OstreeRepoExportArchiveOptions @ {:?}", self as *const _))
+         .field("disable_xattrs", &self.disable_xattrs)
          .finish()
     }
 }
@@ -551,14 +509,9 @@ impl ::std::fmt::Debug for OstreeRepoFileClass {
 }
 
 #[repr(C)]
-pub struct OstreeRepoFileEnumerator(c_void);
+pub struct _OstreeRepoFileEnumerator(c_void);
 
-impl ::std::fmt::Debug for OstreeRepoFileEnumerator {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFileEnumerator @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeRepoFileEnumerator = *mut _OstreeRepoFileEnumerator;
 
 #[repr(C)]
 #[derive(Copy, Clone)]
@@ -661,13 +614,15 @@ impl ::std::fmt::Debug for OstreeRepoFinderResult {
 
 #[repr(C)]
 pub struct OstreeRepoImportArchiveOptions {
+    pub ignore_unsupported_content: c_uint,
     _truncated_record_marker: c_void,
-    // /*Ignored*/field ignore_unsupported_content has incomplete type
+    // field autocreate_parents has incomplete type
 }
 
 impl ::std::fmt::Debug for OstreeRepoImportArchiveOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
         f.debug_struct(&format!("OstreeRepoImportArchiveOptions @ {:?}", self as *const _))
+         .field("ignore_unsupported_content", &self.ignore_unsupported_content)
          .finish()
     }
 }
@@ -747,24 +702,14 @@ impl ::std::fmt::Debug for OstreeSysrootWriteDeploymentsOpts {
 }
 
 #[repr(C)]
-pub struct OstreeTlsCertInteraction(c_void);
+pub struct _OstreeTlsCertInteraction(c_void);
 
-impl ::std::fmt::Debug for OstreeTlsCertInteraction {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeTlsCertInteraction @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeTlsCertInteraction = *mut _OstreeTlsCertInteraction;
 
 #[repr(C)]
-pub struct OstreeTlsCertInteractionClass(c_void);
+pub struct _OstreeTlsCertInteractionClass(c_void);
 
-impl ::std::fmt::Debug for OstreeTlsCertInteractionClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeTlsCertInteractionClass @ {:?}", self as *const _))
-         .finish()
-    }
-}
+pub type OstreeTlsCertInteractionClass = *mut _OstreeTlsCertInteractionClass;
 
 // Classes
 #[repr(C)]
@@ -1297,15 +1242,15 @@ extern "C" {
     pub fn ostree_repo_write_commit_detached_metadata(self_: *mut OstreeRepo, checksum: *const c_char, metadata: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_commit_with_time(self_: *mut OstreeRepo, parent: *const c_char, subject: *const c_char, body: *const c_char, metadata: *mut glib::GVariant, root: *mut OstreeRepoFile, time: u64, out_commit: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_config(self_: *mut OstreeRepo, new_config: *mut glib::GKeyFile, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_content(self_: *mut OstreeRepo, expected_checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, out_csum: *mut *mut [u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_write_content(self_: *mut OstreeRepo, expected_checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_content_async(self_: *mut OstreeRepo, expected_checksum: *const c_char, object: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
     pub fn ostree_repo_write_content_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, out_csum: *mut *mut u8, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_content_trusted(self_: *mut OstreeRepo, checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_dfd_to_mtree(self_: *mut OstreeRepo, dfd: c_int, path: *const c_char, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_directory_to_mtree(self_: *mut OstreeRepo, dir: *mut gio::GFile, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_metadata(self_: *mut OstreeRepo, objtype: OstreeObjectType, expected_checksum: *const c_char, object: *mut glib::GVariant, out_csum: *mut *mut [u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_write_metadata(self_: *mut OstreeRepo, objtype: OstreeObjectType, expected_checksum: *const c_char, object: *mut glib::GVariant, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_metadata_async(self_: *mut OstreeRepo, objtype: OstreeObjectType, expected_checksum: *const c_char, object: *mut glib::GVariant, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_repo_write_metadata_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, out_csum: *mut *mut [u8; 32], error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_write_metadata_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, out_csum: *mut *mut [c_uchar; 32], error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_metadata_stream_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_metadata_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, variant: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_repo_write_mtree(self_: *mut OstreeRepo, mtree: *mut OstreeMutableTree, out_file: *mut *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
@@ -1468,24 +1413,24 @@ extern "C" {
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
     pub fn ostree_check_version(required_year: c_uint, required_release: c_uint) -> gboolean;
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
-    pub fn ostree_checksum_b64_from_bytes(csum: *mut [u8; 32]) -> *mut c_char;
-    pub fn ostree_checksum_b64_inplace_from_bytes(csum: *mut [u8; 32], buf: *mut c_char);
+    pub fn ostree_checksum_b64_from_bytes(csum: *mut [c_uchar; 32]) -> *mut c_char;
+    pub fn ostree_checksum_b64_inplace_from_bytes(csum: *mut [c_uchar; 32], buf: *mut c_char);
     pub fn ostree_checksum_b64_inplace_to_bytes(checksum: *mut [c_char; 32], buf: *mut u8);
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
-    pub fn ostree_checksum_b64_to_bytes(checksum: *const c_char) -> *mut [u8; 32];
-    pub fn ostree_checksum_bytes_peek(bytes: *mut glib::GVariant) -> *mut [u8; 32];
-    pub fn ostree_checksum_bytes_peek_validate(bytes: *mut glib::GVariant, error: *mut *mut glib::GError) -> *mut [u8; 32];
-    pub fn ostree_checksum_file(f: *mut gio::GFile, objtype: OstreeObjectType, out_csum: *mut *mut [u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_checksum_b64_to_bytes(checksum: *const c_char) -> *mut [c_uchar; 32];
+    pub fn ostree_checksum_bytes_peek(bytes: *mut glib::GVariant) -> *mut [c_uchar; 32];
+    pub fn ostree_checksum_bytes_peek_validate(bytes: *mut glib::GVariant, error: *mut *mut glib::GError) -> *mut [c_uchar; 32];
+    pub fn ostree_checksum_file(f: *mut gio::GFile, objtype: OstreeObjectType, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
     pub fn ostree_checksum_file_async(f: *mut gio::GFile, objtype: OstreeObjectType, io_priority: c_int, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_checksum_file_async_finish(f: *mut gio::GFile, result: *mut gio::GAsyncResult, out_csum: *mut *mut [u8; 32], error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_checksum_file_async_finish(f: *mut gio::GFile, result: *mut gio::GAsyncResult, out_csum: *mut *mut [*mut u8; 32], error: *mut *mut glib::GError) -> gboolean;
     #[cfg(any(feature = "v2017_13", feature = "dox"))]
     pub fn ostree_checksum_file_at(dfd: c_int, path: *const c_char, stbuf: *mut stat, objtype: OstreeObjectType, flags: OstreeChecksumFlags, out_checksum: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_checksum_file_from_input(file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, in_: *mut gio::GInputStream, objtype: OstreeObjectType, out_csum: *mut *mut [u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_checksum_from_bytes(csum: *mut [u8; 32]) -> *mut c_char;
+    pub fn ostree_checksum_file_from_input(file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, in_: *mut gio::GInputStream, objtype: OstreeObjectType, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_checksum_from_bytes(csum: *mut [c_uchar; 32]) -> *mut c_char;
     pub fn ostree_checksum_from_bytes_v(csum_v: *mut glib::GVariant) -> *mut c_char;
-    pub fn ostree_checksum_inplace_from_bytes(csum: *mut [u8; 32], buf: *mut c_char);
+    pub fn ostree_checksum_inplace_from_bytes(csum: *mut [c_uchar; 32], buf: *mut c_char);
     pub fn ostree_checksum_inplace_to_bytes(checksum: *const c_char, buf: *mut u8);
-    pub fn ostree_checksum_to_bytes(checksum: *const c_char) -> *mut [u8; 32];
+    pub fn ostree_checksum_to_bytes(checksum: *const c_char) -> *mut [c_uchar; 32];
     pub fn ostree_checksum_to_bytes_v(checksum: *const c_char) -> *mut glib::GVariant;
     //pub fn ostree_cmd__private__() -> /*Ignored*/*const OstreeCmdPrivateVTable;
     pub fn ostree_cmp_checksum_bytes(a: *const u8, b: *const u8) -> c_int;
index ca4ee80cfb667432809e3ba80e0dc4bcd88e7ee3..d8220b9ecc3c13177fd49072aeb1bba889f5e280 100644 (file)
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
                            &abi_cmd, &output).into());
     }
 
-    Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -281,8 +288,8 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
-    ("OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS", "1"),
-    ("OSTREE_CHECKSUM_FLAGS_NONE", "0"),
+    ("(guint) OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS", "1"),
+    ("(guint) OSTREE_CHECKSUM_FLAGS_NONE", "0"),
     ("OSTREE_COMMIT_GVARIANT_STRING", "(a{sv}aya(say)sstayay)"),
     ("OSTREE_COMMIT_META_KEY_COLLECTION_BINDING", "ostree.collection-binding"),
     ("OSTREE_COMMIT_META_KEY_ENDOFLIFE", "ostree.endoflife"),
@@ -290,114 +297,114 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("OSTREE_COMMIT_META_KEY_REF_BINDING", "ostree.ref-binding"),
     ("OSTREE_COMMIT_META_KEY_SOURCE_TITLE", "ostree.source-title"),
     ("OSTREE_COMMIT_META_KEY_VERSION", "version"),
-    ("OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT", "1"),
-    ("OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX", "2"),
-    ("OSTREE_DEPLOYMENT_UNLOCKED_NONE", "0"),
-    ("OSTREE_DIFF_FLAGS_IGNORE_XATTRS", "1"),
-    ("OSTREE_DIFF_FLAGS_NONE", "0"),
+    ("(gint) OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT", "1"),
+    ("(gint) OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX", "2"),
+    ("(gint) OSTREE_DEPLOYMENT_UNLOCKED_NONE", "0"),
+    ("(guint) OSTREE_DIFF_FLAGS_IGNORE_XATTRS", "1"),
+    ("(guint) OSTREE_DIFF_FLAGS_NONE", "0"),
     ("OSTREE_DIRMETA_GVARIANT_STRING", "(uuua(ayay))"),
     ("OSTREE_FILEMETA_GVARIANT_STRING", "(uuua(ayay))"),
-    ("OSTREE_GPG_ERROR_INVALID_SIGNATURE", "1"),
-    ("OSTREE_GPG_ERROR_MISSING_KEY", "2"),
-    ("OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED", "1"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP", "6"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL", "11"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_USER_NAME", "10"),
-    ("OSTREE_GPG_SIGNATURE_ATTR_VALID", "0"),
-    ("OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT", "0"),
+    ("(gint) OSTREE_GPG_ERROR_INVALID_SIGNATURE", "1"),
+    ("(gint) OSTREE_GPG_ERROR_MISSING_KEY", "2"),
+    ("(gint) OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED", "1"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP", "6"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL", "11"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_USER_NAME", "10"),
+    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_VALID", "0"),
+    ("(gint) OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT", "0"),
     ("OSTREE_MAX_METADATA_SIZE", "10485760"),
     ("OSTREE_MAX_METADATA_WARN_SIZE", "7340032"),
     ("OSTREE_META_KEY_DEPLOY_COLLECTION_ID", "ostree.deploy-collection-id"),
-    ("OSTREE_OBJECT_TYPE_COMMIT", "4"),
-    ("OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
-    ("OSTREE_OBJECT_TYPE_DIR_META", "3"),
-    ("OSTREE_OBJECT_TYPE_DIR_TREE", "2"),
-    ("OSTREE_OBJECT_TYPE_FILE", "1"),
-    ("OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"),
-    ("OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"),
+    ("(gint) OSTREE_OBJECT_TYPE_COMMIT", "4"),
+    ("(gint) OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
+    ("(gint) OSTREE_OBJECT_TYPE_DIR_META", "3"),
+    ("(gint) OSTREE_OBJECT_TYPE_DIR_TREE", "2"),
+    ("(gint) OSTREE_OBJECT_TYPE_FILE", "1"),
+    ("(gint) OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"),
+    ("(gint) OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"),
     ("OSTREE_ORIGIN_TRANSIENT_GROUP", "libostree-transient"),
-    ("OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"),
-    ("OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"),
-    ("OSTREE_REPO_CHECKOUT_MODE_NONE", "0"),
-    ("OSTREE_REPO_CHECKOUT_MODE_USER", "1"),
-    ("OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES", "2"),
-    ("OSTREE_REPO_CHECKOUT_OVERWRITE_NONE", "0"),
-    ("OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES", "1"),
-    ("OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL", "3"),
-    ("OSTREE_REPO_COMMIT_FILTER_ALLOW", "0"),
-    ("OSTREE_REPO_COMMIT_FILTER_SKIP", "1"),
-    ("OSTREE_REPO_COMMIT_ITER_RESULT_DIR", "3"),
-    ("OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
-    ("OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
-    ("OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
-    ("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
-    ("OSTREE_REPO_COMMIT_STATE_NORMAL", "0"),
-    ("OSTREE_REPO_COMMIT_STATE_PARTIAL", "1"),
-    ("OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE", "1"),
-    ("OSTREE_REPO_LIST_OBJECTS_ALL", "4"),
-    ("OSTREE_REPO_LIST_OBJECTS_LOOSE", "1"),
-    ("OSTREE_REPO_LIST_OBJECTS_NO_PARENTS", "8"),
-    ("OSTREE_REPO_LIST_OBJECTS_PACKED", "2"),
-    ("OSTREE_REPO_LIST_REFS_EXT_ALIASES", "1"),
-    ("OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS", "4"),
-    ("OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES", "2"),
-    ("OSTREE_REPO_LIST_REFS_EXT_NONE", "0"),
+    ("(gint) OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"),
+    ("(gint) OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"),
+    ("(gint) OSTREE_REPO_CHECKOUT_MODE_NONE", "0"),
+    ("(gint) OSTREE_REPO_CHECKOUT_MODE_USER", "1"),
+    ("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES", "2"),
+    ("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_NONE", "0"),
+    ("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES", "1"),
+    ("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL", "3"),
+    ("(gint) OSTREE_REPO_COMMIT_FILTER_ALLOW", "0"),
+    ("(gint) OSTREE_REPO_COMMIT_FILTER_SKIP", "1"),
+    ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_DIR", "3"),
+    ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
+    ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
+    ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
+    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
+    ("(guint) OSTREE_REPO_COMMIT_STATE_NORMAL", "0"),
+    ("(guint) OSTREE_REPO_COMMIT_STATE_PARTIAL", "1"),
+    ("(guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE", "1"),
+    ("(guint) OSTREE_REPO_LIST_OBJECTS_ALL", "4"),
+    ("(guint) OSTREE_REPO_LIST_OBJECTS_LOOSE", "1"),
+    ("(guint) OSTREE_REPO_LIST_OBJECTS_NO_PARENTS", "8"),
+    ("(guint) OSTREE_REPO_LIST_OBJECTS_PACKED", "2"),
+    ("(guint) OSTREE_REPO_LIST_REFS_EXT_ALIASES", "1"),
+    ("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS", "4"),
+    ("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES", "2"),
+    ("(guint) OSTREE_REPO_LIST_REFS_EXT_NONE", "0"),
     ("OSTREE_REPO_METADATA_REF", "ostree-metadata"),
-    ("OSTREE_REPO_MODE_ARCHIVE", "1"),
-    ("OSTREE_REPO_MODE_ARCHIVE_Z2", "1"),
-    ("OSTREE_REPO_MODE_BARE", "0"),
-    ("OSTREE_REPO_MODE_BARE_USER", "2"),
-    ("OSTREE_REPO_MODE_BARE_USER_ONLY", "3"),
-    ("OSTREE_REPO_PRUNE_FLAGS_NONE", "0"),
-    ("OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE", "1"),
-    ("OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY", "2"),
-    ("OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES", "8"),
-    ("OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY", "2"),
-    ("OSTREE_REPO_PULL_FLAGS_MIRROR", "1"),
-    ("OSTREE_REPO_PULL_FLAGS_NONE", "0"),
-    ("OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP", "16"),
-    ("OSTREE_REPO_PULL_FLAGS_UNTRUSTED", "4"),
-    ("OSTREE_REPO_REMOTE_CHANGE_ADD", "0"),
-    ("OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS", "1"),
-    ("OSTREE_REPO_REMOTE_CHANGE_DELETE", "2"),
-    ("OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS", "3"),
-    ("OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
-    ("OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
-    ("OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
-    ("OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
-    ("OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
-    ("OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
+    ("(gint) OSTREE_REPO_MODE_ARCHIVE", "1"),
+    ("(gint) OSTREE_REPO_MODE_ARCHIVE_Z2", "1"),
+    ("(gint) OSTREE_REPO_MODE_BARE", "0"),
+    ("(gint) OSTREE_REPO_MODE_BARE_USER", "2"),
+    ("(gint) OSTREE_REPO_MODE_BARE_USER_ONLY", "3"),
+    ("(gint) OSTREE_REPO_PRUNE_FLAGS_NONE", "0"),
+    ("(gint) OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE", "1"),
+    ("(gint) OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY", "2"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES", "8"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY", "2"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_MIRROR", "1"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_NONE", "0"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP", "16"),
+    ("(guint) OSTREE_REPO_PULL_FLAGS_UNTRUSTED", "4"),
+    ("(gint) OSTREE_REPO_REMOTE_CHANGE_ADD", "0"),
+    ("(gint) OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS", "1"),
+    ("(gint) OSTREE_REPO_REMOTE_CHANGE_DELETE", "2"),
+    ("(gint) OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS", "3"),
+    ("(gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
+    ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
+    ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
+    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
+    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
+    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
     ("OSTREE_SHA256_DIGEST_LEN", "32"),
     ("OSTREE_SHA256_STRING_LEN", "64"),
-    ("OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY", "0"),
-    ("OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR", "1"),
+    ("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY", "0"),
+    ("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR", "1"),
     ("OSTREE_SUMMARY_GVARIANT_STRING", "(a(s(taya{sv}))a{sv})"),
     ("OSTREE_SUMMARY_SIG_GVARIANT_STRING", "a{sv}"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
-    ("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
-    ("OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
-    ("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
-    ("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
-    ("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
+    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
+    ("(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
+    ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
+    ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
+    ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
     ("OSTREE_TIMESTAMP", "0"),
     ("OSTREE_TREE_GVARIANT_STRING", "(a(say)a(sayay))"),
 ];
index dcd45c50d5fac89d21fcfbaa6026d25af9aa2de0..9836428702b17a217371a5d37662b514a7ef4880 100644 (file)
@@ -7,21 +7,21 @@
 
 int main() {
     printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "%s",
-                    const char *: "%s",
-                    char: "%c",
-                    signed char: "%hhd",
-                    unsigned char: "%hhu",
-                    short int: "%hd",
-                    unsigned short int: "%hu",
-                    int: "%d",
-                    unsigned int: "%u",
-                    long: "%ld",
-                    unsigned long: "%lu",
-                    long long: "%lld",
-                    unsigned long long: "%llu",
-                    double: "%f",
-                    long double: "%ld"),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
            ABI_CONSTANT_NAME);
     return 0;
 }